SparkN0de-git - /page/commit.mu

Micron Document

--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

| SparkN0de-git | SparkN0de |

Node / ReticulumProjects / MeshChatX.git / commits / df60c65

Commit df60c6551d6286240cc9dab37896f3364b5e16f6

󰉖 Browse tree at this commit

Parents : 46dffba

Author : Ivan <ivan@quad4.io>

Signature : Invalid signer <e46112d44649266d71fe2193e00a4710>, author is <ivan@quad4.io>

Date : 2026-06-12T20:09:08-05:00

feat(map): update map file handling and improve tile provider logic

Changes

4 files changed, 73 insertions(+), 50 deletions(-)

M meshchatx/src/backend/map_manager.py +14 -5

M meshchatx/src/frontend/components/map/MapPage.vue +57 -43

M meshchatx/src/frontend/js/mapTileProviders.js +1 -1

M tests/frontend/mapTileProviders.test.js +1 -1

Diff

diff --git a/meshchatx/src/backend/map_manager.py b/meshchatx/src/backend/map_manager.py

index bae912e3..4ce26502 100644

--- a/meshchatx/src/backend/map_manager.py

+++ b/meshchatx/src/backend/map_manager.py

@@ -20,6 +20,17 @@ TRANSPARENT_TILE = base64.b64decode(

MAX_EXPORT_TILES = 200_000

+def is_path_within_dir(path, directory):

+ """Return True when path resolves to a location inside directory."""

+ candidate = os.path.normcase(os.path.normpath(os.path.realpath(path)))

+ root = os.path.normcase(os.path.normpath(os.path.realpath(directory)))

+ return candidate == root or candidate.startswith(root + os.sep)

+def is_mbtiles_filename(filename):

+ return os.path.basename(filename or "").lower().endswith(".mbtiles")

class MapManager:

def __init__(self, config_manager, storage_dir):

self.config = config_manager

@@ -65,7 +76,7 @@ class MapManager:

files = []

if os.path.exists(mbtiles_dir):

for f in os.listdir(mbtiles_dir):

- if f.endswith(".mbtiles"):

+ if is_mbtiles_filename(f):

full_path = os.path.join(mbtiles_dir, f)

stats = os.stat(full_path)

files.append(

@@ -83,11 +94,9 @@ class MapManager:

mbtiles_dir = self.get_mbtiles_dir()

safe_name = os.path.basename(filename)

file_path = os.path.join(mbtiles_dir, safe_name)

- resolved = os.path.realpath(file_path)

- base = os.path.realpath(mbtiles_dir)

- if not resolved.startswith(base + os.sep):

+ if not is_path_within_dir(file_path, mbtiles_dir):

return False

- if os.path.exists(file_path) and file_path.endswith(".mbtiles"):

+ if os.path.exists(file_path) and is_mbtiles_filename(file_path):

if file_path == self.get_offline_path():

self.config.map_offline_path.set(None)

self.config.map_offline_enabled.set(False)

diff --git a/meshchatx/src/frontend/components/map/MapPage.vue b/meshchatx/src/frontend/components/map/MapPage.vue

index 5ce23dcb..0a865859 100644

--- a/meshchatx/src/frontend/components/map/MapPage.vue

+++ b/meshchatx/src/frontend/components/map/MapPage.vue

@@ -100,6 +100,7 @@

<MapDrawingToolbar

+ ref="mapDrawingToolbar"

:tools="drawingTools"

:draw-type="drawType"

:measuring="isMeasuring"

@@ -165,7 +166,7 @@

<h3 class="text-lg font-bold text-blue-700 dark:text-blue-300">{{ $t("map.drop_geo_files") }}</h3>

- <p class="text-sm text-blue-600 dark:text-blue-400 mt-1">GeoJSON, KML, or KMZ</p>

+ <p class="text-sm text-blue-600 dark:text-blue-400 mt-1">{{ $t("map.drop_map_files_hint") }}</p>

</div>

@@ -1174,7 +1175,7 @@ import { styleFromMcxProperties } from "../../js/mapExchange/styleFromProperties

import { computeSegmentMetrics, buildBearingOverlayHtml, buildBearingLiveTooltipHtml } from "../../js/mapGeodesy.js";

const OPENFREEMAP_DEFAULT_STYLE = "https://tiles.openfreemap.org/styles/bright";

-const LEGACY_DEFAULT_OSM_RASTER = "https://tile.openstreetmap.org/{z}/{x}/{y}.png";

+const DEFAULT_OSM_RASTER = "https://tile.openstreetmap.org/{z}/{x}/{y}.png";

const OFFLINE_MB_TILES_URL = "/api/v1/map/tiles/{z}/{x}/{y}.png";

const OFFLINE_TRANSPARENT_TILE_PNG =

"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mP8z8BQDwAEhQGAhKmMIQAAAABJRU5ErkJggg==";

@@ -1237,7 +1238,7 @@ export default {

cachingEnabled: true,

// tile server

- tileServerUrl: OPENFREEMAP_DEFAULT_STYLE,

+ tileServerUrl: DEFAULT_OSM_RASTER,

// search

searchQuery: "",

@@ -2241,20 +2242,37 @@ export default {

isOpenFreeMapStyleUrl(url) {

return typeof url === "string" && url.includes("tiles.openfreemap.org/styles/");

+ isKnownDefaultBasemapUrl(url) {

+ const normalized = (url || "").trim();

+ return normalized === OPENFREEMAP_DEFAULT_STYLE || normalized === DEFAULT_OSM_RASTER;

+ },

+ resolveRasterTileUrl(url) {

+ const normalized = (url || DEFAULT_OSM_RASTER).trim();

+ if (this.isOpenFreeMapStyleUrl(normalized)) {

+ return DEFAULT_OSM_RASTER;

+ }

+ return normalized;

+ },

+ getExportToolButtonEl() {

+ const toolbar = this.$refs.mapDrawingToolbar;

+ if (!toolbar) return null;

+ const ref = toolbar.$refs.exportToolButton;

+ if (!ref) return null;

+ return Array.isArray(ref) ? ref[0] : ref;

+ },

usesOfflineMbtilesRaster() {

if (!this.offlineEnabled) return false;

- const defaultTileUrl = OPENFREEMAP_DEFAULT_STYLE;

- const customTileUrl = this.tileServerUrl || defaultTileUrl;

+ const customTileUrl = this.tileServerUrl || DEFAULT_OSM_RASTER;

const isCustomLocal = this.isLocalUrl(customTileUrl);

if (isCustomLocal) return false;

const isDefaultOnline = this.isDefaultOnlineUrl(customTileUrl);

if (isDefaultOnline) return true;

- if (customTileUrl !== defaultTileUrl && customTileUrl !== LEGACY_DEFAULT_OSM_RASTER) return false;

+ if (!this.isKnownDefaultBasemapUrl(customTileUrl)) return false;

return true;

async buildBaseMapLayer() {

- const url = (this.tileServerUrl || OPENFREEMAP_DEFAULT_STYLE).trim();

- if (!this.offlineEnabled && this.isOpenFreeMapStyleUrl(url)) {

+ const url = (this.tileServerUrl || DEFAULT_OSM_RASTER).trim();

+ if (!this.offlineEnabled && !this.cachingEnabled && this.isOpenFreeMapStyleUrl(url)) {

const group = new LayerGroup();

await applyMapboxStyle(group, url);

return group;

@@ -2398,11 +2416,8 @@ export default {

if (typeof u === "string" && u.length > 0 && !ordered.includes(u)) ordered.push(u);

};

push(primarySrc);

- const ts = this.tileServerUrl || OPENFREEMAP_DEFAULT_STYLE;

- if (!this.isOpenFreeMapStyleUrl(ts)) {

- for (const u of this.expandRasterTileUrlTemplates(ts, z, x, y)) push(u);

- }

- for (const u of this.expandRasterTileUrlTemplates(LEGACY_DEFAULT_OSM_RASTER, z, x, y)) push(u);

+ const ts = this.resolveRasterTileUrl(this.tileServerUrl || DEFAULT_OSM_RASTER);

+ for (const u of this.expandRasterTileUrlTemplates(ts, z, x, y)) push(u);

return ordered;

offlineCachedRasterOnlyLookupUrls(tileCoord, primarySrc) {

@@ -2422,11 +2437,8 @@ export default {

const push = (u) => {

if (typeof u === "string" && u.length > 0 && !ordered.includes(u)) ordered.push(u);

};

- const ts = this.tileServerUrl || OPENFREEMAP_DEFAULT_STYLE;

- if (!this.isOpenFreeMapStyleUrl(ts)) {

- for (const u of this.expandRasterTileUrlTemplates(ts, z, x, y)) push(u);

- }

- for (const u of this.expandRasterTileUrlTemplates(LEGACY_DEFAULT_OSM_RASTER, z, x, y)) push(u);

+ const ts = this.resolveRasterTileUrl(this.tileServerUrl || DEFAULT_OSM_RASTER);

+ for (const u of this.expandRasterTileUrlTemplates(ts, z, x, y)) push(u);

return ordered;

async tryApplyCachedRasterTilesOnly(tile, src) {

@@ -2493,8 +2505,7 @@ export default {

getTileSource() {

const isOffline = this.offlineEnabled;

- const defaultTileUrl = OPENFREEMAP_DEFAULT_STYLE;

- const customTileUrl = this.tileServerUrl || defaultTileUrl;

+ const customTileUrl = this.tileServerUrl || DEFAULT_OSM_RASTER;

const isCustomLocal = this.isLocalUrl(customTileUrl);

const isDefaultOnline = this.isDefaultOnlineUrl(customTileUrl);

@@ -2506,7 +2517,7 @@ export default {

} else if (isCustomLocal) {

// It's a local/mesh URL, allow it

tileUrl = customTileUrl;

- } else if (customTileUrl !== defaultTileUrl && customTileUrl !== LEGACY_DEFAULT_OSM_RASTER) {

+ } else if (!this.isKnownDefaultBasemapUrl(customTileUrl)) {

// It's a custom URL that isn't a known online one,

// assume it might be a local mesh server with a domain.

tileUrl = customTileUrl;

@@ -2514,7 +2525,7 @@ export default {

tileUrl = OFFLINE_MB_TILES_URL;

}

} else {

- tileUrl = customTileUrl;

+ tileUrl = this.resolveRasterTileUrl(customTileUrl);

}

const source = new XYZ({

@@ -2710,15 +2721,11 @@ export default {

this.dismissTileConnectivityBanner();

if (enabled) {

- const defaultTileUrl = OPENFREEMAP_DEFAULT_STYLE;

const defaultNominatimUrl = "https://nominatim.openstreetmap.org";

const isCustomTileLocal = this.isLocalUrl(this.tileServerUrl);

const isDefaultTileOnline = this.isDefaultOnlineUrl(this.tileServerUrl);

- const hasCustomTile =

- this.tileServerUrl &&

- this.tileServerUrl !== defaultTileUrl &&

- this.tileServerUrl !== LEGACY_DEFAULT_OSM_RASTER;

+ const hasCustomTile = this.tileServerUrl && !this.isKnownDefaultBasemapUrl(this.tileServerUrl);

const isCustomNominatimLocal = this.isLocalUrl(this.nominatimApiUrl);

const isDefaultNominatimOnline = this.isDefaultOnlineUrl(this.nominatimApiUrl);

@@ -2771,6 +2778,7 @@ export default {

await window.api.patch("/api/v1/config", {

map_tile_cache_enabled: enabled,

});

+ await this.updateMapSource();

} catch (e) {

console.error("Failed to save caching setting", e);

}

@@ -2854,21 +2862,24 @@ export default {

const file = event.target.files[0];

if (!file) return;

- if (!file.name.endsWith(".mbtiles")) {

+ await this.uploadMbtilesFile(file);

+ event.target.value = "";

+ },

+ isMbtilesFile(file) {

+ return Boolean(file?.name && file.name.toLowerCase().endsWith(".mbtiles"));

+ },

+ async uploadMbtilesFile(file) {

+ if (!this.isMbtilesFile(file)) {

ToastUtils.error(this.$t("map.select_mbtiles_error"));

- return;

+ return false;

}

this.isUploading = true;

const formData = new FormData();

- formData.append("file", file);

+ formData.append("file", file, file.name);

try {

- const response = await window.api.post("/api/v1/map/offline", formData, {

- headers: {

- "Content-Type": "multipart/form-data",

- },

- });

+ const response = await window.api.post("/api/v1/map/offline", formData);

this.metadata = response.data.metadata;

this.hasOfflineMap = true;

@@ -2883,7 +2894,6 @@ export default {

await this.updateMapSource();

ToastUtils.success(this.$t("map.upload_success"));

- // If the map has bounds, we might want to fit to them

if (this.metadata.bounds) {

const bounds = this.metadata.bounds.split(",").map(parseFloat);

if (bounds.length === 4) {

@@ -2891,12 +2901,13 @@ export default {

this.map.getView().fit(extent, { padding: [20, 20, 20, 20] });

}

+ return true;

} catch (e) {

const error = e.response?.data?.error || e.message;

ToastUtils.error(this.$t("map.upload_failed") + ": " + error);

+ return false;

} finally {

this.isUploading = false;

- event.target.value = ""; // Reset input

}

async setAsDefaultView() {

@@ -2969,11 +2980,9 @@ export default {

positionOnboardingTooltip() {

this.$nextTick(() => {

- if (!this.$refs.exportToolButton || !this.$refs.tooltipElement) return;

+ const exportButton = this.getExportToolButtonEl();

+ if (!exportButton || !this.$refs.tooltipElement) return;

- const exportButton = Array.isArray(this.$refs.exportToolButton)

- ? this.$refs.exportToolButton[0]

- : this.$refs.exportToolButton;

const tooltip = this.$refs.tooltipElement;

const buttonRect = exportButton.getBoundingClientRect();

const tooltipRect = tooltip.getBoundingClientRect();

@@ -4401,6 +4410,7 @@ export default {

const files = Array.from(ev.dataTransfer?.files || []);

if (!files.length) return;

+ const mbtilesFiles = files.filter((f) => this.isMbtilesFile(f));

const geoFiles = files.filter((f) => {

const name = f.name.toLowerCase();

return (

@@ -4410,11 +4420,15 @@ export default {

name.endsWith(".kmz")

);

});

- if (!geoFiles.length) {

- ToastUtils.warning(this.$t("map.drop_no_geo_files"));

+ if (!mbtilesFiles.length && !geoFiles.length) {

+ ToastUtils.warning(this.$t("map.drop_no_supported_files"));

return;

}

+ for (const file of mbtilesFiles) {

+ await this.uploadMbtilesFile(file);

+ }

for (const file of geoFiles) {

try {

const name = file.name.toLowerCase();

diff --git a/meshchatx/src/frontend/js/mapTileProviders.js b/meshchatx/src/frontend/js/mapTileProviders.js

index 38331995..15f60d9a 100644

--- a/meshchatx/src/frontend/js/mapTileProviders.js

+++ b/meshchatx/src/frontend/js/mapTileProviders.js

@@ -1,6 +1,6 @@

/** Raster basemap providers tried in order when tiles fail to load. */

-export const RASTER_TILE_PROVIDER_ORDER = ["openfreemap", "osm"];

+export const RASTER_TILE_PROVIDER_ORDER = ["osm", "openfreemap"];

export const TILE_PROVIDER_URLS = {

openfreemap: "https://tiles.openfreemap.org/styles/bright",

diff --git a/tests/frontend/mapTileProviders.test.js b/tests/frontend/mapTileProviders.test.js

index a0ae53ec..bd123e98 100644

--- a/tests/frontend/mapTileProviders.test.js

+++ b/tests/frontend/mapTileProviders.test.js

@@ -12,8 +12,8 @@ describe("mapTileProviders", () => {

});

it("returns next provider not yet attempted", () => {

- expect(nextRasterTileProviderId("openfreemap", [])).toBe("osm");

expect(nextRasterTileProviderId("osm", [])).toBe("openfreemap");

+ expect(nextRasterTileProviderId("openfreemap", [])).toBe("osm");

expect(nextRasterTileProviderId("openfreemap", RASTER_TILE_PROVIDER_ORDER)).toBe(null);

});

──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────